Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 2 Dec 2005 15:48:55 +0000 (15:48 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 2 Dec 2005 15:48:55 +0000 (15:48 +0000)
commit895f3158e2631699e9b96dbb5ae930a24981f240
tree477d7b495f89a8911ee791b7a54d85773ceea2cd
parentd1dd4f46f5a4fe6cfbe22a6e36d1ad20f3d0e081
parentaf71f48393b6faaeb05627650ef65f604ea58837
Merged.